Refactored the old methods with the new one.