Vastly improve project