Starting to fix may's mess