big batch of changes