not perfect, but need to submit, version before final as it still includes tracking methods