Updated with some TPA-stuff