renamed class, functions