added latest changes from eCost v5