added some stuff
merged conflicts