Trying refactor to right way...