Redo the 1.0.3 changes ...