Reimplement baseline in old main.py