Updated files for my personal use