Merged vince branch code