FIX for function name changes