adding armadillo inputs from cs184_v7