change back to old structure