revamped the file, still having some issues