commented out non refactored code