clean, bundle tracking working