Issues  SC-2 and SC-3 fixed 

2 issues are fixed