changes from 6/8