Some repo remodeling