Final Alpha version before cleaning and preparation for beta