An attempt at adding registration