incremental alignment hopefully debugged