more adjustments related to latest specs