Update for A8

Made it work on Alpha8