Change alignment calculation and add issue tractability