Added mouse support back in