added back SL hacks from pre update (6.22) version