Added auto fit