renamed message-first to first-message