change some struct back