Registration, needs improvements