address ted's review comments