Implementing Max's sugs.