Update for Alpha 8, contributed by Carry