changed messages to match the structure in the controler