Added a couple more methods