Finished version 1.0