Fixed Conditions Json and updated the format somewhat