stage 4 modifications (see the google doc)