Working on the #15, but still missing some messages for the last three