Updated to latest working project