updates to work with 2.1.1
Resolved conflict