Updated mouselistener