Phase 2 - Cleaned up register action