Removed CAF stuff until permission granted