Final changes, working project