Completed 1.1 and fixed logic error in 1.7