refactored in PyBulls meeting