initial round of changes