Completed updates for version 2.1