working on mouse tracking
fixed conflict