Add registration count limit - still in debugging
Fix reg limit