changed some unrenamed function