Add Path. Rename some things