version 1.0 complete with edits