Add some points which have to be looked into for tango2