Code updates to v2.1