added a few lines
fixed merge