added a beta feature for this, lmk know if it helps