commented out the prior code and added new, refactored, minimalist code