Start updating to collect edition (Not compilable)