Final code changes for version 2.0 production