pw edits from work and Gabe edit