first batch of changes done