Getting started improvment