Improve quick start