Working on registration