Updated setup to include launching on finish