changes in light of @macintux comments