Updates according to Marina's revision