first batch of changes