update for json loading