Updated to Alpha 7 and minor rewriting