refactory > CS- 2696