added more functions

still slow