Adding auto launch