some changes after consulting with greg