CARE #37: Removed manual value calculating