draft changes afrete review 2