changed requirements
merge json fix