improved patch22