Auto Update overhaul
Updated aar