Further modifications V0.22