Roger Federer says he will work on his baseline game going into Wimbledon.

Federer fell in the semifinals in both Stuttgart and Halle, his first events since withdrawing from the French Open.

Speaking to journalists in Halle, he said his serving and returning had improved since the beginning of Stuttgart, but he was lacking consistency from the baseline.

"I guess that comes through movement and through just playing enough again," he said. "And I think if the movement gets better and then the baseline game improves a little bit, I’ll be better on the big points, on the return."

In general, he described himself as satisfied with his comeback after missing time with a back injury.

"But, you know, I’m OK and I’m pleased on how I played," he said. “Now we’ve got enough time before Wimbledon to get ready for that."

He did note that he’s not yet back in top form, as evidenced by his three-set semifinals losses.

"I got some work to do,” the 17-time Grand Slam champion said. “The other guys are doing their job well. So, I just have to take the right decisions from now to the start of Wimbledon. And once the tournament gets going, I [have] play the way that I want to play—positive, aggressive, mindset. Play the points my way and just be super consistent, make the opponent feel uncomfortable."

Federer is No. 3 in the rankings.