adding json handling back in