Version 3.0.0
More improvement, not yet there