added tracker addition and warranty check