Work done for align depracation