Totally agreed. Don't worry about Shape. Then we'd need to get shape fixed up before pre2 though, which seems reasonable to finally do.