setup step 2 && some improvements