Added a couple of functions