Updated to allow for updated welcomer