adding the latest changes