Cleaned up tracking update and ensure grayscale