repository adding/removing is much improved