complex shapes (almost) working again