now works with messages