Final changes before r1