add the != -1 back in