Added more code for procs and lambdas