Updated with auto scale version