Refactored to maintain previous description