Latest changes to TAP tool