Changes from Kay's run through