Modified controllers to match the new format and style.