Implement suggestions from Chris: