Implement suggestions from Hadley