Selection added for most of the shapes