new article and minor changes
fixed merge