Code change to support SL6