move messages work
fixed merge conflcits