Added a couple additional methods