moved basics into one step