Restructuring and updating to match MERS