merged in files from the netbook