added better conditional comparing