Updated to work with SL