Changed cursor command not to relay on the command option
Simple cleanup