New solution (non-working)