Fixed the project (this is the real beta v1)