added some stuff..