upgrade to 2.1, add memory fix