Updated to work with L4 final