Changes for post click

clickandWait
other ones needed