latest changes for SCLD_AT2P approach