Implement suggestions from Roger