After much testing... this should work...