Adding A04 and A05