Added support for newest sample (i)