Another improvements