testing TODO comments
Added registration failure fallback.