v2.0 done. Testing and minor tuning welcomed