changed back to original message keys