added many manual overrides