wip fix progress