Distinguished between Click and Position Command
Replaced Position Commands with Click COmmands where appropriate