Adding auto-scale