Add conditions to final hint