full functionality restored

after hiding the second shape option to enable compilation of simpler
version.