Refactored, name change