Changed comparison & ifstatement