Aligning with latest server