AiE Fixing whats broken