added our_solution