update 25/06 wp implement