added a couple more functions