added some stuff
merged