incorporate the latest changes