Finished Version 1.1