Tech Debt: resetting back to working version