major changes to the copy of 01- still no rej-sampling