Updated CSE funtionality