refactoring to Deviations