More work on the hybrid_tools.py script