renamed class
WIP