First round of improvements