improvement for engage model