update interface, avoiding replication with g+
Merge branch 'design'