added some stuff ;-)