Design Changes as in document