updated to work with new clickme rewrite