Finish changes from Chip round 1