Changed main launch setup