WIP: removing nack specific stuff to speed up.