make step 1 and 2 even more user-friendly