New working repo, OC and all previous tweaks