migrate to L-compat