my changes
fixed merge etc...