upgrade to 2.1