Feature/476 angie wp