Refactoring and support surge price