add refactored solution
new solution - paired with Francisco