Final edits V2.3
Version 2.3 code