[PATCH 1,2/2] pungi patches