Experimental version with no separate offset computation