Made some changes with Brian