Updated to have Auto Scaling