more tinkering with v1.0.4