Finished Version 1.1 and 1.2