added undecline and tracking