lots of changes
fixed merge