Updated with some lambda stuff