Added a couple of things