second round of changes - not completed