Shouldn't be hard to top the old design in that department.
Aside from that, the facility needs lots of office space and the latest utilities and the head of OBL on a pike at the main entrance.
NY lost as much office space as in the entire downtown Atlanta. Failure to rebuild rentable space will damage NY forever.