Update with suggestions from 60434