Updated to new version v2.1