Changed some of the function names back so that the library makes sense again...