another messaging fix
merge
messing name
yup