Finished new version

Done for V2.1