OS 1.0.3-dev much improved