Working on right auto setup