Added fallback controller functionality