Update refactored solution