added devices and masterfile