Fixing CS about right now