Porting my changes from the last week.