Added new architecture shadow2, fixes with alignment