Implemented two further functions