refactor baseline