working on steve's edits