Added mouse tracking