Updated clicky code