Design changes merged in, incomplete