Incorporating gradual fixes