last (messy) updates for Théo