Code changes (10/25)

Code changes