Updated to include tracking to an external source