update tracking for a mininum working and clean code.