Really really add armadillo