Josh's edits