Added function version of refactoring