Add a couple more functions