Allignment improvements