More temporary design changes.