Updated main and manager