Got stuff from old files to fix everything