a few updates to stage 2