merging
added some stuff