update after thirman's edits