resolving the conflict of the "glass" instrument, plus rebuild