Edits for Version 1.2