Reverted back to

id searching, adding prompt messages