Updated with Alignment