Replace old l() functions, with new one