add latest round of changes for initial