modified some messages