moving to simplified framework