some comports code, no big change