update to account for code changes after rebase