Refactored with name change