Adding changes from the meeting