added some clicking support