Added more untested functions