Made some changes for Colin