added Or's notebook