Rewrite Row Helper from scratch