Working WRQ with fixes and tested