Thanks... I am refactoring