more adjustments to code