added calls, returns and restarts