rebuild to use json files