getting close to final repo fix