Yes, you may retrofit directly to meet the NDS within the DTS window or at your own discretion before 2040.
We encourage you to inform us of your plans early, so that MOM and other agencies can assess the impact to bed supply both during and after your retrofitting.