Put this right after repo initialization