Fixed observer + code to add a message