bring changes made for w3 into this repo