Added TODO
Implemented lambda version