Many changes. 3.0.5