changed to use pcPlus1, got rid of custom structs