* replaced lambda's by annonymous classes