Fixed part 2 comments from Cullen