Enhanced analyse.py