Changed in code calls from methods to filters. Added _complete private function.