turned off method rewriting
added lambda expression