added stuff for Uwi and Uwd