Did a couple more functions