Updated messages and merged