Added special thanks custom field
Better logic