Updated Conditionals to return correct value