Update project to 5.8