Fixing the project, now is a workable version