20141116 - Cleaning up Ron's mess