improved source tracking