first revision -- adding all edits i have dontso far