Added a couple of suggestions