Added a little more functionality