ch4 changes from anguarfire 0.8