imrpvements from testing on WP