Playing with ccw refactor