I think it is working. Couple more tests, I guess needed to lock it down