Aamir Khan and Katrina to have two songs in 'Dhoom 3'

Mr Perfectionist apparently shakes a leg with co-star Katrina Kaif in not one but two songs. Considering that he essays a gymast, is there one on a tightrope too?