Assessment ready, minor corrections