Changed RegistryCrit to be even cooler.

Also, re-added i++ outside of switch block