Please check both revised design #90 & #91.
Thanks a lot.