switched to using json values