Committed changes for part 2