[Npos_2018] Update from Demark