changes from 5/23