Remove the lambda madness
Update screenshot