updates to 2.1