more lambda replacements