Fix/public repo round2

Like it!