Changes for changing H87 into G204