forcing commits
Fixing Alignment matching issues for testing

Have to go back to the drawing board on why the alignment matching is
screwed after last commits / pull iteration rolled changes.