Minor changes so it's using ACT_v1 stuff