added fromjson