Improved quickstart