updated with some notification stuff
updated to have merge
merge