A little more modem polishing