Fine tuning and final touches on the user welcomes' and welcomes extension