add check depricated data (need fix)