removed anonymous functions