[PATCH 0/3] New WPS Implementation