[UPDATE] pre PR adjustments