one slight change in Function class