Working on diagram