fixing registration, not done yet