Revert "randomizing shape choice"

This reverts commit 04d90667cc0a48d7542f08870a9540aa7275dbea.
Revert "Revert "randomizing shape choice""

This reverts commit b02740c42f3d3b62ef0b1149c465db2a046cb765.