Updated to Alpha 6 and some rewriting