Updated Clicky code