huge batch of changes