Made some changes for Paul