added some stuff....