changes from 604