added all the messages according to the plan from Saturday