Made a few changes for COTD