changes to use json