Ntp rework