Minor modification...