mehran small changes maily for lfp