Tweaks to include L&R now as well