Updated to new nougat syntax