Enhanced hints

Enhanced hints