Added more conditionals to evaluate method