incorporated jeremy's edits