Update refactored solution (but still need to add)