Old changes but needed to update into personal git