added more design goals
(cherry picked from commit 174e8e8)