Update a bit of the manager.py