last batch of changes