Added return and lambda and functions class