added some stuff and bla