Amends from Stuart 5/8/14
Removed autoclick