Messages added, fixed order