some changes?
adding message directory