Worked on final version 1 issues