which is causing me a headache...before I combined the two things were working pretty good...but now that I have them combined it seems to get confused. I am working on an issue for GitHub