better flow; removes unecessary model additions