fix avancement and stuff