Redid the lambda thing