- Adjusted order of 2 main opperations. refactoring will now fire 2nd in order to force correct sorting.