plugins added
merging changes