Updated existing routines
more edits, more routines