Added support for single click setup and start