convert more code to use XFILE