Finished changes for Madison CFP