Converted to VS project, simplified pivot selection