9/13_refactored