Sprint2 issues Fixed