* round of changes