Fixing what happened II Cal's Server