removed != for None checking