Changes to hopefully get serial