Integrated AVL, changed stop functionality