Last changes based on NCPP team feedback.