updates with latest changes