Indian cricket captain Mahendra Singh Dhoni said on Thursday that swashbuckling opener Virender Sehwag, who is recuperating from shoulder surgery, is shaping up well and should be available for next month's Champions Trophy