Making some updates suggested by VIP