Clicking is a bit better now