moving to model based setup