tested and working

I will combine shipping