Made some cleanup for the projecrt, if it stops working please revert to one version before.