couple more definition changes.