Adding new commits from luggage_people