Subset + some tweaks to Tars