added answer logic
added search