added cs for resolving new issues