all fixed except model call