it worked
Merge branch 'sti'
doing some more testing