code changes prior to fb checkpoint