Updated vixen from master