added comments
fixed merge