@cszovati - can you review this feature for me?