Adding some classes
dummy modifications
TODO
no idea