last round of changes