removed more functions