Some remodeling