change Attributes to Shape
comments in lambda-defs
undo overhaul, back to ids