edits from josh