2nd Sprint Finished(Refactoring needed)