Changes for A500