Updated to reflect suggestions I didn't see last time