CLickhandler changes