Thane/Refactor/Danny R.R