added feedback from Mike in comments