Added r16 support.

Added r16 support