[v.1.6.0] Latest adjustments