Resolve the hardware issues before you introduce more changes.