Updated unit after last commit
Speed improvement (not calling to_matrix unnecessarily)