Update on welcome and locationvc