Switched to simple registration