special attn to @kavi_rt cc: @nchokkan @iamkarki