try upgrading to 1.10 and i guess you wont need this defines??

the code i posted worked with a7.10 commerical without defines.

anyway good to hear you solved it, good luck with your project.