changes from 4/25