Issue #29: I still need to adjust aligner and test