Adapted to changed hint commands.