lots of vix changes
fixing conflicts