Adapted to new RFC002