Implemented some more functions