[BUGFIX beta] Rewrite with transform to use block params