graph and autostop added