Tidied up and changed archeight calculation