Refactored to include new name