incorporated last round of changes