Reorganized, increased length of prime table