removed 2 unnecessary methods and fixed a bug that just called it self infinatly