New Eddy AVS2

Done, I think