changes 24-25

changes 24-25