More adjustment for facing

Progressive removal of GET_F