v1.1.0.2 overhaul