L&F improvement