Add find & fix print