Andy Murray says he will play a full part in Great Britain's Davis Cup defence this year.
Murray, 28, previously suggested that playing the whole competition would be tough in a congested summer that includes the Olympics.
But before this weekend's first-round tie against Japan he said he would play in a quarter-final that falls between Wimbledon and the Rio Games.
"That's the plan, but it's hypothetical just now," said the world number two.
If Britain can get past Japan, who include world number six Kei Nishikori, they will face either Kazakhstan or world number one Novak Djokovic's Serbia.