Updated with CSSA position