Added even more ifs to tracking