Add regenerator, fix circle centering