tweaked auto register