completed v2.0
resolved merging conflict