move lambda to better place