Refactored registration cod3