code 25.6
merge code 24.6