Modified my_solution