Removing the master detail stuff and adding send message