Only a few improvements needed