Copy/paste of Ben Leather L3 Inspired improvements