massive chnages to csss