completely removed all traces of function!