Registration works
Major update