update with latest changes by people