start of version 2.1 changes