Updated from Bashos`` and ready for R16B