added some stuff, rebase later