improved quickstart