mostly changes to the file handler