step one & two + welcome page updated