shouldn't this be "X" and "Y" being consistent with our_functions list ?