Just making it more 'catkin friendly', and my thoughts...