updated simulator & conversion to JSON