refactored baseline setup