Updated files for my use and developmet