v.1.1 - last adjustments