First set of changes to solving eager problem.
Solving eager problem.