Updated signatures, offsets still need updating