Implemented a couple more functions