Updated xpview