updated to point out Andy's improvements