Before AVL integration