Expand on Mouse logic