Another set of improvements