Updating with latest changes