Version 2.1 updates