made changes to the handler, and changed fileManager