may have finally nailed nan issue; removed names from logical functions