updates to tdd_shapes and tdd_shapes2