Refactored baseline