incorporated the changes after sprint walkthrough