updated WPs and others