Update to Version 2.1