slight change of plan - see if a simpler thing works
fixed some more specs