change registration mechanism :)