Hopefully last change for design document