Functions Fixes.