Package reading completely redone.