smalle changes to allow it to run in the interpreter