6th one + small fixes