added some stuff to manage