[Npos_2018] final draft PR (edited)