Adds some more functions, even better speeds