added some stuff
fixed merge conflict