[Npos_2018] en PR with final edits