changed to own class