Changes from preclass and in class from 26 Feb