updated, still need to merge json during init