Update to work with both L4.1 & L4.2