Lots of work towards new version of Indication