as promised on the old server CC