added our solution from my branch