Sprint5

@prabinv - can you code review?
Can you fix the indentation from line 78 till here?