stage 4 modifications II (see the google doc)