The additions in here really feel like something that should be in the step method. I would really prefer to keep the tuning logic within a step method.