Injected functions now seem to be behaving