Started to implement lambda version