new change after SL code merge.