Added better mouse functionality