Fixed & Updated