Refactored for name change