Upgraded Componenets