should be able to handle new json layout