more edits, more routines