Changed the creator checking to accommodate all 3 normal messages