Code Refactor-> WIP. Try to change flow of control
Code Refactor-> WIP. Try to change flow of control