wmrojer's version 4.3.1