add some UNPACKs to improve performance a bit