Rafactored response finder code and added other responses