new solution with correct format