adapt latest changes