Updates by American & Efird