made r16 compatibility