started fixing validity section