changes from 4/22 b