added and modified
new stuff
fixed merge issues