Added missing files from Checkpoint2