主要 #Upgraded Version