deleted even more functions