replaced lambda with not empty