removed some helper funcs