Final changes for June 4 responsive work