2.0.0 improvements v2