Rename

Added mouse interaction, optimisation