changed the contoller to accept the 2 models