Changes to hopefully get closer to serial success