second round of improvements