new design for public/private switch
version 1.1.7