Second commit to wp-wap