Further development on the updated optimization and upgrading plan

Further development on the updated optimization and upgrading plan