revised structure, bailed on build.