Use less default shapes, and more abstractness in the next one...